bitkeeper revision 1.1391 (4270e62dQ3ab85LBG8yTiEDbCEYRqA)

author mjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>

Thu, 28 Apr 2005 13:33:33 +0000 (13:33 +0000)

committer mjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>

Thu, 28 Apr 2005 13:33:33 +0000 (13:33 +0000)
author mjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Thu, 28 Apr 2005 13:33:33 +0000 (13:33 +0000)
committer mjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Thu, 28 Apr 2005 13:33:33 +0000 (13:33 +0000)
diff --cc .rootkeys
Simple merge
diff --cc tools/Makefile

index 57f8ed10210979737fbe215a480aad5d7e373928,9f4a601d023558d62d35379f5a820327f0e0371f..44f452649ac3a4e4680caf98ea8579ed6a290add
--- 1/tools/Makefile
--- 2/tools/Makefile
+++ b/tools/Makefile
@@@ -10,9 -10,8 +10,10 @@@ SUBDIRS += xentrac
   SUBDIRS += python
   SUBDIRS += xfrd
   SUBDIRS += xcs
+ +ifndef XEN_NO_IOEMU
   SUBDIRS += ioemu
+ +endif
+ SUBDIRS += pygrub
   
   .PHONY: all install clean check check_clean
author	mjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
	Thu, 28 Apr 2005 13:33:33 +0000 (13:33 +0000)
committer	mjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
	Thu, 28 Apr 2005 13:33:33 +0000 (13:33 +0000)
		1	2
.rootkeys	patch \|	diff1 \|	diff2 \|	blob \| history
tools/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history